tools-xenstat-prefix.diff

Patch-Name: tools-xenstat-prefix.diff

Gbp-Pq: Topic prefix-abiname
Gbp-Pq: Name tools-xenstat-prefix.diff

diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile
index 2d165b7e999874c953771bc003abde4e74912447..ff317b3f211b0bc413a57259dd263fda5ce073ff 100644 (file)
--- a/tools/xenstat/libxenstat/Makefile
+++ b/tools/xenstat/libxenstat/Makefile
@@ -20,7 +20,7 @@ MAKE_LINK=ln -sf
 
 LIB=src/libxenstat.a
 SHLIB=src/libxenstat.so
-OBJECTS-y=src/xenstat.o
+OBJECTS-y=src/xenstat.o src/xenstat_qmp.o
 OBJECTS-$(CONFIG_Linux) += src/xenstat_linux.o
 OBJECTS-$(CONFIG_SunOS) += src/xenstat_solaris.o
 OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o
@@ -64,17 +64,19 @@ $(SHLIB): $(OBJECTS-y)
 
 .PHONY: install
 install: all
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)
+       $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_LIB)
        $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(includedir)
        $(INSTALL_DATA) $(LIB) $(DESTDIR)$(libdir)/libxenstat.a
-       $(INSTALL_PROG) src/libxenstat.so $(DESTDIR)$(libdir)
+       $(INSTALL_PROG) src/libxenstat.so $(DESTDIR)$(LIBEXEC_LIB)
        $(INSTALL_DATA) xenstat.pc $(DESTDIR)$(PKG_INSTALLDIR)
 
 .PHONY: uninstall
 uninstall:
        rm -f $(DESTDIR)$(PKG_INSTALLDIR)/xenstat.pc
-       rm -f $(DESTDIR)$(libdir)/libxenstat.so
+       rm -f $(DESTDIR)$(LIBEXEC_LIB)/libxenstat.so
        rm -f $(DESTDIR)$(libdir)/libxenstat.a
-       rm -f $(DESTDIR)$(includedir)/xenstat.h
+       rm -f $(DESTDIR)$(LIBEXEC_LIB)/xenstat.h
 
 PYLIB=bindings/swig/python/_xenstat.so
 PYMOD=bindings/swig/python/xenstat.py

diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile
index ec612db2a258527c543e45306702df9378c21f01..6a8c8d27cd8cff1722599ded385c5f7eda587a35 100644 (file)
--- a/tools/xenstat/xentop/Makefile
+++ b/tools/xenstat/xentop/Makefile
@@ -19,7 +19,9 @@ all install xentop uninstall:
 else
 
 CFLAGS += -DGCC_PRINTF -Werror $(CFLAGS_libxenstat)
+LDFLAGS += $(call LDFLAGS_RPATH,../lib)
 LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(TINFO_LIBS) $(SOCKET_LIBS) -lm
+LDLIBS += $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore)
 CFLAGS += -DHOST_$(XEN_OS)
 
 # Include configure output (config.h)
@@ -31,12 +33,12 @@ all: xentop
 
 .PHONY: install
 install: xentop
-       $(INSTALL_DIR) $(DESTDIR)$(sbindir)
-       $(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop
+       $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
+       $(INSTALL_PROG) xentop $(DESTDIR)$(LIBEXEC_BIN)/xentop
 
 .PHONY: uninstall
 uninstall:
-       rm -f $(DESTDIR)$(sbindir)/xentop
+       rm -f $(DESTDIR)$(LIBEXEC_BIN)/xentop
 
 endif